Skip to content

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

alexcrichton and others added 12 commits May 4, 2020 08:35
Pulls in updated MSVC detection logic landed in rust-lang/cc-rs#488
Rework MIR drop tree lowering

This PR changes how drops are generated in MIR construction. This is the first half of the fix for rust-lang#47949.

Rather than generating the drops for a given unwind/break/continue/return/generator drop path as soon as they are needed, the required drops are recorded and get generated later.

The motivation for this is
* It simplifies the caching scheme, because it's now possible to walk up the currently scheduled drop tree to recover state.
* The basic block order for MIR more closely resembles execution order.

This PR also:
* Highlights cleanup blocks in the graphviz MIR output.
* Removes some unnecessary drop flag assignments.
…lacrum

Update the `cc` crate

Pulls in updated MSVC detection logic landed in rust-lang/cc-rs#488
…-types-section, r=kinnison,ollie27

Sort "implementations on foreign types" section in the sidebar

Fixes rust-lang#71926.

We were sorting by the ID instead of sorting by the name. They're not in the same order as the implementations but I think it makes more sense this way considering this is what we do for the methods as well.

r? @kinnison

cc @rust-lang/rustdoc
…lan-DPC

Add missing backtick in E0569 explanation

r? @Dylan-DPC
@RalfJung
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented May 10, 2020

📌 Commit f2b655f has been approved by RalfJung

@rustbot rustbot added the rollup A PR which is a rollup label May 10, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 10, 2020
@bors
Copy link
Collaborator

bors commented May 10, 2020

⌛ Testing commit f2b655f with merge 9912925...

@bors
Copy link
Collaborator

bors commented May 10, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 9912925 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 10, 2020
@bors bors merged commit 9912925 into rust-lang:master May 10, 2020
@nnethercote
Copy link
Contributor

There was a big perf regression for one of the script-servo-opt-incr-patched jobs.

@alexcrichton, @GuillaumeGomez, @matthewjasper: any idea which PR might have caused this?

@RalfJung
Copy link
Member Author

It's #71840, here's pre-landing perf from that PR; also see #71840 (comment).

@RalfJung RalfJung deleted the rollup-1ns58no branch May 10, 2020 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants